Refactor UI on MainVision