Logo and Tweaks

Change-Id: I45e0ad5da953ce7f344d3a57668cdf33df1beb04
OPTIMIZATION

Change-Id: I11354e344ed82fa367e1fcafa0daf4440189ca20