Stylesheet updates and cleaup

Looking from some inputs from @githubteacher before merging.