Fix label presentation. Related to #18
Fix layout problem. Related to #17