refactored images location and added more forms