Merge conflicts
Update info route and styling in process
Remove stray files