layout improved, replate default routing system with angular-ui-router and someother changes