Removed remaining usages of GravityButton, converted to GravityLayout