Added cosmetic changes from Tommy https://github.com/KanoComputing/Design-staging/issues/64