some styling & performance updates