Tidying up some buttons