Major cleanup of fricking tabs.....drives me nutz!!!!

Change-Id: Ida6196e1a99b35fec022f0b28a1bb7798ddd2b7d