Changed the major structure of the UI to command based inputs