Fixed some inconsistences between similar UI templates