Coreonly modus layout fixes