added tables
Fixed method invocation
Menu cleanups