Bug fixes + Label changes + Fast clicks