Restructure ui layout
Restructure markup