Fixing the layouts