Fixing bugs after applying latest version of angular-ui