Make Options Form more dynamic