Layout fixes & translations update