Cleaning up the bar

Relevant fixes the entire community will enjoy, hopefully.