Fixed multiple bugs regarding model refactoring.
Made minor changes to UI to adjust for wider screens.
Consolidated all models into one file. NOT COMPLETE