updated router with more stylist changes and added in a fixme