UI Updates

To be continued