better layout and English, fix mode line