Fixed layout and french translation