bug fixing, menu changes