Updated: menu now has active states