fix: fix: removed header stuff from layout

@shortdiv 

Glad we fixed these merge issues together. This is ready to merge into Master. High fives!