Changed button colors and text
Merge remote-tracking branch 'origin/new' into new