#16 Changed navigation logic
#17 Minor progress