Added keyboard shortcuts and cleaned up watch