bug fixes and ui changes

implemented more shortcuts