Fixed validation errors and added the menu functionality

@patheard almost there!!