Minor tweaks in main-layout to accomodate F7 styles