Restructured styling files. Updates to styles and markup