Hotfix User Layout