Commit 1.4

Vaguely trying to fix the triangulation. Changes to ui amongst other
things.