changed expander creation to be server side