Some rework to layouts, addition of markdown todo