some improvements and scss refactor