Added more navigation options