Merge pull request #68 from SmokyBob/feature/material_design

UI Improvements