UI fix ups and webap reorg