Router changes and starting to organize CSS