Refactored some panel stuff; initial control option panel implementation