UI Updates

Still buggy