Improvments on render layout