UI improvements and Gif