Added options and a popup