MOBILE-168 New template and code style corrections