Improve the layout and add google maps