Made the layout more dynamic and split it up a bit

Change-Id: I5af5f2806a998fe6d32d30619798565ff07f7911
Improved the default layout structure

Change-Id: Ie18ddaeccbd3700953623764de101051b2329bfe