UI layout and colors updated