Improve navigation -- Fix #24 for now