Changes from initial draft, moved styles into separate directory