format stuff
move some stuff around
add conditional header layout to layout folder