Refactored layouts and added more images