Moved classes around, added buttons, fixed controls more