UI Updates

More work on the UI