Removed redundant control constants, replaced with button names