fixed bug, added navigation controller