Small fixes and polishing of the UI