Added display in percentages. Bugfixes and better usability