Added translations and fixed layout