Serious style updates
Hack to ensure tooltips are approximately in the correct place
Merge pull request #2 from MarcelCutts/kadibranch

Fixed tooltip + minor code style resolution