fixed renderings issues