Added more Settings State - fixed the indicators