Ui reordering and colors

Fixes #84.