Fixing markup
Adding more features to screen.sass