Some minor cleaning up [ci skip].
Added a spinner widget to our window widget (#452) [ci skip].