Issue #16 #25:
Big changes on the layout view...
Optimize the view structure.