more layout fixes and adjustments-fixed color changes