Clean code
Reformat code
Re arrange frontend views