Drop down menu added, options support added