Update to layouts and wiki editing (also added show preview)