Formatting updates and fixed an incorrect menu ID.