PR Before JON

Merged in Andy's and added close logic for taskbar's small chat choices when closed