Added logo and cleaned more