Little changes and cleanup of shortcuts