Bug fixes in the main bar