Minor adjustements in layouts