Added more customization and keyboard shortcuts