Clean Up and Rebuild

Started from scratch and added a fixed header and footer.