Finished building up Menu and cleaned up a bit