Added text highlighter and image viewer layout
Changed order of some conditions and checks