improve layout
Merge pull request #17 from kimquy/new_layout

improve layout