Fix label presentation. Related to #18
Fix layout problem. Related to #17
Merge pull request #21 from deandr/master

Fix for bugs #17 and #18