UI changes done by ongraph

Please review changes and merge this code.