User experience improvements

Not final yet...