Restructure layout
Simplify the views