Fixed button highlighting, tweaked message display