moved add buttons to proper places