enhance template
cleanup code; add default picture