Fixes layout issues