styling & new rendering logic