Fixed some bugs introduced by earlier merge with master, removed buttons.

Also hid the fps counts for now, and made a change suggested by Zach.