Added a colored button, made a few tweaks