clean-up

1. refactored and cleaned-up a bunch of code
2. Area under text now darkens when there's a mouse over it to improve
the contrast