Several changes to the scss organization
Minor teeks to the css styles
Added two screens