updated router, model
updated key binds
resolved merge conflicts while merging controller branch