Major changes to css and PSA