Layout fixes and color changes