This is the problem with designing and re-designing where function follows form.

You have to keep changing and the only way to go, seemingly, is away from functional.