Added options page
merge