setup better navigation / routes. simplified code a bit.