ui and fix bug
angular way of life compliant