Tidyup ImageView in layout
Merge branch 'feature/tidyup-layout' into develop

* feature/tidyup-layout:
  Tidyup ImageView in layout