Added Timer and remover unneeded stuff. Updated the bus popover