Improve spindleUI