Fixed issues with UI router