Added scss files and bug fixes