Validation of menu added, validation bugs fixed