Include accordian in ui and update accordian element names

Signed-off-by: Don Naegely <naegelyd@gmail.com>