Reworked some content areas, styling