main screen + indicator fix