UI changes
Moved PopupMenu to separate object
Added support for actions to reduce UI complexity