Various UI Bug Fixes

@anandpdoshi please check