layout, color and dependency fixes