Small layout changes in 2.3 and 4
Merge branch 'master' of https://github.com/GufCab/ITONK_Project