Review tab navigation

Fixed #209