Continued new style changes

Continuation on new style and modified page flows