layout fixes + only 1 namechange allows