Cleanup/restructuring, added sticky footer
Cleanup/restructure + sticky footer