Fixed layout issues