Added equipment list display, misc improvements