Fixed various layout issues