Added states and menu