Cleanup and organize some CSS, change routes