Cleanup/restructuring, added sticky footer