added I18n in views and changed some formatting