Improved design, added package name and new strings