Fixed the slogan
Continued refactoring because of recent design changes