Button heights + few minor fixes