Still commented out, but redesigned screen tree elements