Fixed view messages router
Finished up screens for v2.0.0