optimized design and added keyboard shortcuts