Fixed bus grouping, added onlcick event handler.