fix spinner selection and clean up my shitty code

Signed-off-by: Grarak <williye97@gmail.com>