Adding primary layout
Misc addings