Got filter event working.
Got layout of add row adjusted to include menu button.