changes in css for admin panel
changes as per new design
conflict merged
changes in home
merged