Enhance visual appearance: Make 2 column layout
Merge branch 'layout' into develop