added more UI goodness