update the sass structrure add in grunt and remove incorrect styles