few changes, sass added