Merge pull request #24 from peter-tackage/look-and-feel

Look and feel