Front end antipattern fix

Χάρης Παπαδόπουλος requested to merge harisrnd/e-epal:front_end_antipattern_fix into develop Mar 17, 2017