Cluttered user interface

Other Muni issues: