Restore changes lost since 3528, missing logs later.
Rearrange menus to fit bigger fonts.
Authored by: utunnels 2011-10-15
Parent: [r3528]
Child: [r3530]