Added logo and cleanup