Macrophoto navigation and fields added