Clean up and fixing layout and images