Imrpove user interface; fix translations