Refactor Constant + Fix Firefox Click Issue + Waiting Time
Fix some of Firefox compability isuees