Added remainder of styles, will need some fixes