Fix - Minor fixes and ui updates