Added percentage display toggle functionality / minor tidy