added logo, proper states changing