layout and translation fixes