fixed empty class
reordered buttons, cleanup