[PATCH] Fix for UI inconsistencies around the catalog dropdown buttons