Refactoring to allow testing of controller
Code review and refactoring
Testing Bootstrap and context menus