Updating Layout and Cleaning up the UI

Implemented Headers and Footers, Cleaned up the UI and reviewed the
layout.