Improved options panel