Second pass at web ui to match app better