Refactored some of the table view and hotkeys