Added accordion control
Added search (WIP)