Fixed several layout issues