more style changes
moving css around
mergin