Merge pull request #1 from superlogical/look-and-feel

Look and feel