Modified words panel
Changed some formatting
Merge branches 'master' and 'dev'