Fix java 5,6 compatibility error. Rearrange menu buttons.