Fix #165, Add RTL spinner, small graphical changes
Resolve merge conflicts