cleanup layout and colors