(chore): Fix infinite loader; style tweaks