Change structure to support 2 languages & major changes in UI