Handle button sizes; minor fixes