updates to rendering logic