Clean code and issue fixes (Shortcuts & Toolbar)

+ Fix shortcuts #49
+ Bind shortcuts too toolbar #47
+ Clean code