Refactor CSS/Test/Routes