Merge pull request #26 from Gavin-AG/master

no service tip
layout update