Made some layouts a bit nicer