Fix bugs
Fix shortcuts
Fixed