[Issue #195][WIP] fixed the spinners wierd popovers
[Issue #195][MC] resolved merge conflicts