Merge pull request #25 from Gavin-AG/master

layout update
no service tip