ui fixes, color buttons completed, small fixes