R-MVC refactor: added the ctrl + s save functionality and fixed
inconsistencies