Fixed up name collission in UI. Added proper view.