Fixed layout issues
Fixed layout issues