Skype - template fix and nav tweak