fixed overflow and color scheme