Feature ui stability

This is in progress... tidying up the UI in a number of places, both for stability and look and feel.