Changed button colour + added more fade effects
Merge remote-tracking branch 'origin/master'