Let competition look the same as project
Fix several layout issues