adopt new library structure. tweak button size