UI push

This push has vaious UI edits