New states added + working menu