Fixes issues #14 and #16. Makes the layout similar between extended and collapsed views. Also moves the padding on the top of the label down 4 pixels.
Merge branch 'hotfix/colorsfix' into dev