Simplify states and add menu