Fixed some button layout problems
March 10 release