Fix main view, add markdown support
merge remote