Changed layout and added language support