Minor cleanup, added highlighting to buttons