Changes for hints window
changes for button effect
Merge remote-tracking branch 'upstream/master'