added new styles and change the logo
resolving conflict