Recoded buttons, fixed pagination, etc etc