Adds right spotlight template.

Also random code style updates.