Further changes
[#191] fixed
Merge pull request #207 from akvo/Visuals/Bunch-of-changes

Further changes