Refactored controller/view package
GUI Edits