UI and hopefully double click issue changes