Cleaned up layout, added footer