Fixing the layouts hopefully