Layout and language fixes