Fixes user layout issues