New Layout
Cleanup images
Removed excess stuff