Cleanup and merge to master.
Add source modal view.