Simplify layout options + small fix for headheight