Moving to flat button design