fix sass watch task issue + some display issues