cleanded up buttongs and