put messaging back and change buttons to be top and bottom