minor improvements
Redid UI with help from @rlemon