image edit at activities updated and code cleanup