lots of updates to accomodate for new stylesheet