Better buttons and styles
Renames and a bug fix.