removed border button + simplify module