Fixed #529 and finished arranging views for TOTB and finished TOTB navigation