Fixed Android click issues