Reworked routing slightly; Added auto-detection of view