Added better footer
Started moving logic to service
Merged