Small changes and prettying up the pages