Fixes to the topBar buttons -- Commit 33