continued base styling and cleaning up sass