added more navigation and fallback for not-working links