Updated UI. Started on implementation of i18n