layout changes, fixed colors