Fixing up ComboButtons and stuff