some layout changes, colors mainly