restructures layout and improves locale selector