Some layout and color touches