Fixed KBT #165 and #185

Fixed
Removed wrong mobile template file name
Merge pull request #1173 from Undercova/master

Merge