fix locales, improve view