initial checkin over DEV for elro_ad along with some ul changes