Updated some GUI elements
Merge branch 'Niels' into develop