Added AC control button and minor UI change