Changes in css

Cleaner now but needs a few logical changes to implement view changes