More dialog functionality, started developing context menu