Added content and styling, cleaned up some code