Some clean up and button tweaking