polishing ui.. ir functionality is in working condition