Refactored active state, added keyboard interactions.