new layout
Merge pull request #1 from Gpx/new_layout

new layout