consolidating some rendering components