cleaned up styling and incorporated partials