fixing few bugs

cleaning up scss and css files