Fixed button overflow.
More layout updates.