Tidy up menu popup alignment code & comments