Updated with photo and fixed form-controls