Updated template layout and style