- Fix minor bugs - Enhance combo box management