Added more rendering code and adjusted values to correct issues