Fixing z-index issues with focus and active button states