Prettifying UI
Merge branch 'OCR' into testing