* Fixed some repetition issues
 * Added some translation, stability and UX improvements