Added resource bundle and fixed more tables