Bug fixes and ui updates

Bug fixes and UI updates