Welcome back to Conkeror

Some fixes, reordering, and trying improved modality.