Changed popup menu to a grid layout
"Delete" menu item now includes an 'X'
Parameterize the generics
First pass at parameterizing the generics