Fixed issue with head padding and added layouts