ToggleButton -> ImageButton + delete some unused button + add spinner