Rename flag button variables, shorten render