added lang switch, brushing up layout