Lot of minor fixes and clenup with fluid theme redesign