Updated logo and some layouts