More markup and changed menu