Fixed underline and VTab bug (closes #442)

Ok here is the updated pull request. Since I'm not an expert with git I was unable to resolve the merge conflict between my branch and master, so I had to create a new branch. Maybe it's better this way anyway, because now it's just one clean commit.
Anyway this is the up to date commit :)