Fixed several layout issues due to merge