Cleaned up and added navigation support