Populr customizations
resolved conflict
resolved conflict
omitted this in the rename
make undo accessible via the Aloha object
button links and fixed alignment