fix frontend releated issues got while merging other branches
fix frontend releated issues got while merging other branches

damianmoore/photo-manager,damianmoore/photo-manager,damianmoore/photo-manager,damianmoore/photo-manager