Fixed: removed some nbsp hacks

This was introducing some undesired spaces in places. This should be
reintroduced properly when it's apparent why this was necessary