Include bus stops or not based on a checkable menu item
Remove transport type filter buttons

This reverts commit 2d38429dc39ea90e3c715f56db1c18ec202e9879
... and then some.