Adjust margin
Fix controls