Restructured layout to be more simple