Adjust colors, start working on validation