Add Logo, improve layout, modify navbar, fixed bugs