beta 2.0 rows added and 2 buttons