Layout improvements & header