Continuing the major UI rewrite