merge latest from Mark

Also replace default skeleton main page