Some rework
Added configcheck for mainheaders
rearranged the mainheaders and moved some subheaders to mainheader as we now have enough space