MIFOSX-117: integrate ui changes for GSOC project for andreas.